From fd7b0fe52311953378b6c3529063234463c05ce6 Mon Sep 17 00:00:00 2001 From: "kaf24@freefall.cl.cam.ac.uk" Date: Tue, 5 Oct 2004 21:57:59 +0000 Subject: [PATCH] bitkeeper revision 1.1159.101.1 (416318e7OLlgbVl-gis30vfV_7zfoQ) Rename start_info variable to xen_start_info to avoid name clash with drivers. --- .../arch/xen/drivers/balloon/balloon.c | 6 ++-- .../arch/xen/kernel/head.S | 4 +-- .../arch/xen/kernel/process.c | 2 +- .../arch/xen/kernel/setup.c | 32 +++++++++---------- .../arch/xen/kernel/time.c | 6 ++-- linux-2.4.27-xen-sparse/arch/xen/mm/init.c | 12 +++---- linux-2.4.27-xen-sparse/drivers/char/mem.c | 2 +- .../include/asm-xen/keyboard.h | 2 +- .../arch/xen/i386/kernel/head.S | 4 +-- .../arch/xen/i386/kernel/ioport.c | 2 +- .../arch/xen/i386/kernel/process.c | 2 +- .../arch/xen/i386/kernel/setup.c | 18 +++++------ .../arch/xen/i386/kernel/time.c | 6 ++-- .../arch/xen/i386/mm/init.c | 8 ++--- .../arch/xen/kernel/ctrl_if.c | 6 ++-- .../arch/xen/kernel/reboot.c | 8 ++--- linux-2.6.8.1-xen-sparse/drivers/char/mem.c | 2 +- .../drivers/xen/blkback/blkback.c | 4 +-- .../drivers/xen/blkfront/blkfront.c | 4 +-- .../drivers/xen/console/console.c | 10 +++--- .../drivers/xen/netback/netback.c | 4 +-- .../drivers/xen/netfront/netfront.c | 4 +-- .../drivers/xen/privcmd/privcmd.c | 2 +- .../asm-i386/mach-xen/setup_arch_post.h | 2 +- .../include/asm-xen/asm-i386/setup.h | 4 +-- .../include/asm-xen/hypervisor.h | 8 ++--- 26 files changed, 82 insertions(+), 82 deletions(-) diff --git a/linux-2.4.27-xen-sparse/arch/xen/drivers/balloon/balloon.c b/linux-2.4.27-xen-sparse/arch/xen/drivers/balloon/balloon.c index 8ec2e0152e..27ca6e83dd 100644 --- a/linux-2.4.27-xen-sparse/arch/xen/drivers/balloon/balloon.c +++ b/linux-2.4.27-xen-sparse/arch/xen/drivers/balloon/balloon.c @@ -473,7 +473,7 @@ static int __init init_module(void) { printk(KERN_ALERT "Starting Xen Balloon driver\n"); - most_seen_pages = current_pages = min(start_info.nr_pages,max_pfn); + most_seen_pages = current_pages = min(xen_start_info.nr_pages,max_pfn); if ( (balloon_pde = create_xen_proc_entry("memory_target", 0644)) == NULL ) { printk(KERN_ALERT "Unable to create balloon driver proc entry!"); @@ -486,14 +486,14 @@ static int __init init_module(void) /* * make a new phys map if mem= says xen can give us memory to grow */ - if ( max_pfn > start_info.nr_pages ) + if ( max_pfn > xen_start_info.nr_pages ) { extern unsigned long *phys_to_machine_mapping; unsigned long *newmap; newmap = (unsigned long *)vmalloc(max_pfn * sizeof(unsigned long)); memset(newmap, ~0, max_pfn * sizeof(unsigned long)); memcpy(newmap, phys_to_machine_mapping, - start_info.nr_pages * sizeof(unsigned long)); + xen_start_info.nr_pages * sizeof(unsigned long)); phys_to_machine_mapping = newmap; } diff --git a/linux-2.4.27-xen-sparse/arch/xen/kernel/head.S b/linux-2.4.27-xen-sparse/arch/xen/kernel/head.S index d0b5e5cddd..d48bb7098d 100644 --- a/linux-2.4.27-xen-sparse/arch/xen/kernel/head.S +++ b/linux-2.4.27-xen-sparse/arch/xen/kernel/head.S @@ -15,8 +15,8 @@ ENTRY(stext) ENTRY(_stext) cld lss stack_start,%esp - /* Copy the necessary stuff from start_info structure. */ - mov $SYMBOL_NAME(start_info_union),%edi + /* Copy the necessary stuff from xen_start_info structure. */ + mov $SYMBOL_NAME(xen_start_info_union),%edi mov $128,%ecx rep movsl jmp SYMBOL_NAME(start_kernel) diff --git a/linux-2.4.27-xen-sparse/arch/xen/kernel/process.c b/linux-2.4.27-xen-sparse/arch/xen/kernel/process.c index d03acd64a1..9c1123b740 100644 --- a/linux-2.4.27-xen-sparse/arch/xen/kernel/process.c +++ b/linux-2.4.27-xen-sparse/arch/xen/kernel/process.c @@ -338,7 +338,7 @@ void __switch_to(struct task_struct *prev_p, struct task_struct *next_p) } queue_multicall2(__HYPERVISOR_stack_switch, __KERNEL_DS, next->esp0); - if ( start_info.flags & SIF_PRIVILEGED ) + if ( xen_start_info.flags & SIF_PRIVILEGED ) { dom0_op_t op; op.cmd = DOM0_IOPL; diff --git a/linux-2.4.27-xen-sparse/arch/xen/kernel/setup.c b/linux-2.4.27-xen-sparse/arch/xen/kernel/setup.c index e530df79d3..61c2f73a07 100644 --- a/linux-2.4.27-xen-sparse/arch/xen/kernel/setup.c +++ b/linux-2.4.27-xen-sparse/arch/xen/kernel/setup.c @@ -114,7 +114,7 @@ extern int blk_nohighio; int enable_acpi_smp_table; /* Raw start-of-day parameters from the hypervisor. */ -union start_info_union start_info_union; +union xen_start_info_union xen_start_info_union; #define COMMAND_LINE_SIZE 256 static char command_line[COMMAND_LINE_SIZE]; @@ -131,7 +131,7 @@ static int __init parse_mem_cmdline (char ** cmdline_p) int mem_param = 0; /* Save unparsed command line copy for /proc/cmdline */ - memcpy(saved_command_line, start_info.cmd_line, COMMAND_LINE_SIZE); + memcpy(saved_command_line, xen_start_info.cmd_line, COMMAND_LINE_SIZE); saved_command_line[COMMAND_LINE_SIZE-1] = '\0'; for (;;) { @@ -275,7 +275,7 @@ void __init setup_arch(char **cmdline_p) * arch/xen/drivers/balloon/balloon.c */ mem_param = parse_mem_cmdline(cmdline_p); - if (!mem_param) mem_param = start_info.nr_pages; + if (!mem_param) mem_param = xen_start_info.nr_pages; #define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT) #define PFN_DOWN(x) ((x) >> PAGE_SHIFT) @@ -323,11 +323,11 @@ void __init setup_arch(char **cmdline_p) } #endif - phys_to_machine_mapping = (unsigned long *)start_info.mfn_list; - cur_pgd = init_mm.pgd = (pgd_t *)start_info.pt_base; + phys_to_machine_mapping = (unsigned long *)xen_start_info.mfn_list; + cur_pgd = init_mm.pgd = (pgd_t *)xen_start_info.pt_base; - start_pfn = (__pa(start_info.pt_base) >> PAGE_SHIFT) + - start_info.nr_pt_frames; + start_pfn = (__pa(xen_start_info.pt_base) >> PAGE_SHIFT) + + xen_start_info.nr_pt_frames; /* * Initialize the boot-time allocator, and free up all RAM. Then reserve @@ -337,7 +337,7 @@ void __init setup_arch(char **cmdline_p) * bootstrap page table. We are guaranteed to get >=512kB unused 'padding' * for our own use after all bootstrap elements (see hypervisor-if.h). */ - boot_pfn = min((int)start_info.nr_pages,lmax_low_pfn); + boot_pfn = min((int)xen_start_info.nr_pages,lmax_low_pfn); bootmap_size = init_bootmem(start_pfn,boot_pfn); free_bootmem(0, PFN_PHYS(boot_pfn)); reserve_bootmem(__pa(&_stext), @@ -352,20 +352,20 @@ void __init setup_arch(char **cmdline_p) #ifdef CONFIG_BLK_DEV_INITRD - if ( start_info.mod_start != 0 ) + if ( xen_start_info.mod_start != 0 ) { - if ( (__pa(start_info.mod_start) + start_info.mod_len) <= + if ( (__pa(xen_start_info.mod_start) + xen_start_info.mod_len) <= (max_low_pfn << PAGE_SHIFT) ) { - initrd_start = start_info.mod_start; - initrd_end = initrd_start + start_info.mod_len; + initrd_start = xen_start_info.mod_start; + initrd_end = initrd_start + xen_start_info.mod_len; initrd_below_start_ok = 1; } else { printk(KERN_ERR "initrd extends beyond end of memory " "(0x%08lx > 0x%08lx)\ndisabling initrd\n", - __pa(start_info.mod_start) + start_info.mod_len, + __pa(xen_start_info.mod_start) + xen_start_info.mod_len, max_low_pfn << PAGE_SHIFT); initrd_start = 0; } @@ -384,7 +384,7 @@ void __init setup_arch(char **cmdline_p) virt_to_machine(pfn_to_mfn_frame_list) >> PAGE_SHIFT; /* If we are a privileged guest OS then we should request IO privileges. */ - if ( start_info.flags & SIF_PRIVILEGED ) + if ( xen_start_info.flags & SIF_PRIVILEGED ) { dom0_op_t op; op.cmd = DOM0_IOPL; @@ -395,9 +395,9 @@ void __init setup_arch(char **cmdline_p) current->thread.io_pl = 1; } - if (start_info.flags & SIF_INITDOMAIN ) + if (xen_start_info.flags & SIF_INITDOMAIN ) { - if( !(start_info.flags & SIF_PRIVILEGED) ) + if( !(xen_start_info.flags & SIF_PRIVILEGED) ) panic("Xen granted us console access but not privileged status"); #if defined(CONFIG_VT) diff --git a/linux-2.4.27-xen-sparse/arch/xen/kernel/time.c b/linux-2.4.27-xen-sparse/arch/xen/kernel/time.c index 9257befe87..387c255222 100644 --- a/linux-2.4.27-xen-sparse/arch/xen/kernel/time.c +++ b/linux-2.4.27-xen-sparse/arch/xen/kernel/time.c @@ -128,7 +128,7 @@ static int __init __independent_wallclock(char *str) } __setup("independent_wallclock", __independent_wallclock); #define INDEPENDENT_WALLCLOCK() \ - (independent_wallclock || (start_info.flags & SIF_INITDOMAIN)) + (independent_wallclock || (xen_start_info.flags & SIF_INITDOMAIN)) #ifdef CONFIG_XEN_PRIVILEGED_GUEST /* @@ -340,7 +340,7 @@ void do_settimeofday(struct timeval *tv) last_update_from_xen = 0; #ifdef CONFIG_XEN_PRIVILEGED_GUEST - if ( start_info.flags & SIF_INITDOMAIN ) + if ( xen_start_info.flags & SIF_INITDOMAIN ) { dom0_op_t op; last_update_to_rtc = last_update_to_xen = 0; @@ -455,7 +455,7 @@ static inline void do_timer_interrupt(int irq, void *dev_id, } #ifdef CONFIG_XEN_PRIVILEGED_GUEST - if ( (start_info.flags & SIF_INITDOMAIN) && + if ( (xen_start_info.flags & SIF_INITDOMAIN) && ((time_status & STA_UNSYNC) == 0) ) { /* Send synchronised time to Xen approximately every minute. */ diff --git a/linux-2.4.27-xen-sparse/arch/xen/mm/init.c b/linux-2.4.27-xen-sparse/arch/xen/mm/init.c index 0766deef50..6a694022bf 100644 --- a/linux-2.4.27-xen-sparse/arch/xen/mm/init.c +++ b/linux-2.4.27-xen-sparse/arch/xen/mm/init.c @@ -221,9 +221,9 @@ static void __init pagetable_init (void) /* create tables only for boot_pfn frames. max_low_pfn may be sized for * pages yet to be allocated from the hypervisor, or it may be set - * to override the start_info amount of memory + * to override the xen_start_info amount of memory */ - int boot_pfn = min(start_info.nr_pages,max_low_pfn); + int boot_pfn = min(xen_start_info.nr_pages,max_low_pfn); /* * This can be zero as well - no problem, in that case we exit @@ -315,7 +315,7 @@ void __init paging_init(void) zone_sizes_init(); /* Switch to the real shared_info page, and clear the dummy page. */ - set_fixmap(FIX_SHARED_INFO, start_info.shared_info); + set_fixmap(FIX_SHARED_INFO, xen_start_info.shared_info); HYPERVISOR_shared_info = (shared_info_t *)fix_to_virt(FIX_SHARED_INFO); memset(empty_zero_page, 0, sizeof(empty_zero_page)); @@ -376,9 +376,9 @@ static int __init free_pages_init(void) /* add only boot_pfn pages of low memory to free list. * max_low_pfn may be sized for * pages yet to be allocated from the hypervisor, or it may be set - * to override the start_info amount of memory + * to override the xen_start_info amount of memory */ - int boot_pfn = min(start_info.nr_pages,max_low_pfn); + int boot_pfn = min(xen_start_info.nr_pages,max_low_pfn); /* this will put all low memory onto the freelists */ totalram_pages += free_all_bootmem(); @@ -392,7 +392,7 @@ static int __init free_pages_init(void) reservedpages++; } #ifdef CONFIG_HIGHMEM - for (pfn = start_info.nr_pages-1; pfn >= highstart_pfn; pfn--) + for (pfn = xen_start_info.nr_pages-1; pfn >= highstart_pfn; pfn--) one_highpage_init((struct page *) (mem_map + pfn), pfn, bad_ppro); totalram_pages += totalhigh_pages; #endif diff --git a/linux-2.4.27-xen-sparse/drivers/char/mem.c b/linux-2.4.27-xen-sparse/drivers/char/mem.c index 6c6fadaf4c..f9ef0f54e9 100644 --- a/linux-2.4.27-xen-sparse/drivers/char/mem.c +++ b/linux-2.4.27-xen-sparse/drivers/char/mem.c @@ -234,7 +234,7 @@ static int mmap_mem(struct file * file, struct vm_area_struct * vma) { unsigned long offset = vma->vm_pgoff << PAGE_SHIFT; - if (!(start_info.flags & SIF_PRIVILEGED)) + if (!(xen_start_info.flags & SIF_PRIVILEGED)) return -ENXIO; /* DONTCOPY is essential for Xen as copy_page_range is broken. */ diff --git a/linux-2.4.27-xen-sparse/include/asm-xen/keyboard.h b/linux-2.4.27-xen-sparse/include/asm-xen/keyboard.h index d05927cd93..81c49a6908 100644 --- a/linux-2.4.27-xen-sparse/include/asm-xen/keyboard.h +++ b/linux-2.4.27-xen-sparse/include/asm-xen/keyboard.h @@ -43,7 +43,7 @@ extern unsigned char pckbd_sysrq_xlate[128]; #define SYSRQ_KEY 0x54 -#define kbd_controller_present() (start_info.flags & SIF_INITDOMAIN) +#define kbd_controller_present() (xen_start_info.flags & SIF_INITDOMAIN) /* resource allocation */ #define kbd_request_region() diff --git a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/head.S b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/head.S index e67c5b3ea0..b41a96db42 100644 --- a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/head.S +++ b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/head.S @@ -36,8 +36,8 @@ ENTRY(startup_32) /* Set up the stack pointer */ lss stack_start,%esp - /* Copy the necessary stuff from start_info structure. */ - mov $start_info_union,%edi + /* Copy the necessary stuff from xen_start_info structure. */ + mov $xen_start_info_union,%edi mov $128,%ecx rep movsl diff --git a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/ioport.c b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/ioport.c index 6cbd6c9336..bb3b0f3090 100644 --- a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/ioport.c +++ b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/ioport.c @@ -22,7 +22,7 @@ asmlinkage long sys_iopl(unsigned int new_io_pl) if ((new_io_pl > old_io_pl) && !capable(CAP_SYS_RAWIO)) return -EPERM; - if (!(start_info.flags & SIF_PRIVILEGED)) + if (!(xen_start_info.flags & SIF_PRIVILEGED)) return -EPERM; /* Maintain OS privileges even if user attempts to relinquish them. */ diff --git a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/process.c b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/process.c index 75816caf32..ee7be2bd5c 100644 --- a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/process.c +++ b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/process.c @@ -568,7 +568,7 @@ struct task_struct fastcall * __switch_to(struct task_struct *prev_p, struct tas C(0); C(1); C(2); #undef C - if (start_info.flags & SIF_PRIVILEGED) { + if (xen_start_info.flags & SIF_PRIVILEGED) { op.cmd = DOM0_IOPL; op.u.iopl.domain = DOMID_SELF; op.u.iopl.iopl = next->io_pl; diff --git a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/setup.c b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/setup.c index b225c26fad..5b1aec8b9d 100644 --- a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/setup.c +++ b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/setup.c @@ -342,7 +342,7 @@ multicall_entry_t multicall_list[8]; int nr_multicall_ents = 0; /* Raw start-of-day parameters from the hypervisor. */ -union start_info_union start_info_union; +union xen_start_info_union xen_start_info_union; extern void (*pm_idle)(void); @@ -682,7 +682,7 @@ static void __init parse_cmdline_early (char ** cmdline_p) int len = 0; int userdef = 0; - memcpy(saved_command_line, start_info.cmd_line, MAX_CMDLINE); + memcpy(saved_command_line, xen_start_info.cmd_line, MAX_CMDLINE); /* Save unparsed command line copy for /proc/cmdline */ saved_command_line[COMMAND_LINE_SIZE-1] = '\0'; @@ -1020,7 +1020,7 @@ static unsigned long __init setup_memory(void) * partially used pages are not usable - thus * we are rounding upwards: */ - start_pfn = PFN_UP(__pa(start_info.pt_base)) + start_info.nr_pt_frames; + start_pfn = PFN_UP(__pa(xen_start_info.pt_base)) + xen_start_info.nr_pt_frames; find_max_pfn(); @@ -1081,7 +1081,7 @@ static unsigned long __init setup_memory(void) #endif #ifdef CONFIG_BLK_DEV_INITRD - if (start_info.mod_start) { + if (xen_start_info.mod_start) { if (INITRD_START + INITRD_SIZE <= (max_low_pfn << PAGE_SHIFT)) { /*reserve_bootmem(INITRD_START, INITRD_SIZE);*/ initrd_start = INITRD_START + PAGE_OFFSET; @@ -1098,7 +1098,7 @@ static unsigned long __init setup_memory(void) } #endif - phys_to_machine_mapping = (unsigned long *)start_info.mfn_list; + phys_to_machine_mapping = (unsigned long *)xen_start_info.mfn_list; return max_low_pfn; } @@ -1358,7 +1358,7 @@ void __init setup_arch(char **cmdline_p) init_mm.start_code = (unsigned long) _text; init_mm.end_code = (unsigned long) _etext; init_mm.end_data = (unsigned long) _edata; - init_mm.brk = (PFN_UP(__pa(start_info.pt_base)) + start_info.nr_pt_frames) << PAGE_SHIFT; + init_mm.brk = (PFN_UP(__pa(xen_start_info.pt_base)) + xen_start_info.nr_pt_frames) << PAGE_SHIFT; code_resource.start = virt_to_phys(_text); code_resource.end = virt_to_phys(_etext)-1; @@ -1423,7 +1423,7 @@ void __init setup_arch(char **cmdline_p) register_memory(max_low_pfn); /* If we are a privileged guest OS then we should request IO privs. */ - if (start_info.flags & SIF_PRIVILEGED) { + if (xen_start_info.flags & SIF_PRIVILEGED) { dom0_op_t op; op.cmd = DOM0_IOPL; op.u.iopl.domain = DOMID_SELF; @@ -1433,8 +1433,8 @@ void __init setup_arch(char **cmdline_p) current->thread.io_pl = 1; } - if (start_info.flags & SIF_INITDOMAIN) { - if (!(start_info.flags & SIF_PRIVILEGED)) + if (xen_start_info.flags & SIF_INITDOMAIN) { + if (!(xen_start_info.flags & SIF_PRIVILEGED)) panic("Xen granted us console access " "but not privileged status"); diff --git a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/time.c b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/time.c index 821ff92867..87503b673b 100644 --- a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/time.c +++ b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/time.c @@ -147,7 +147,7 @@ static int __init __independent_wallclock(char *str) } __setup("independent_wallclock", __independent_wallclock); #define INDEPENDENT_WALLCLOCK() \ - (independent_wallclock || (start_info.flags & SIF_INITDOMAIN)) + (independent_wallclock || (xen_start_info.flags & SIF_INITDOMAIN)) /* * Reads a consistent set of time-base values from Xen, into a shadow data @@ -309,7 +309,7 @@ int do_settimeofday(struct timespec *tv) last_update_from_xen = 0; #ifdef CONFIG_XEN_PRIVILEGED_GUEST - if (start_info.flags & SIF_INITDOMAIN) { + if (xen_start_info.flags & SIF_INITDOMAIN) { dom0_op_t op; last_rtc_update = last_update_to_xen = 0; op.cmd = DOM0_SETTIME; @@ -427,7 +427,7 @@ static inline void do_timer_interrupt(int irq, void *dev_id, } #ifdef CONFIG_XEN_PRIVILEGED_GUEST - if (!(start_info.flags & SIF_INITDOMAIN)) + if (!(xen_start_info.flags & SIF_INITDOMAIN)) return; /* Send synchronised time to Xen approximately every minute. */ diff --git a/linux-2.6.8.1-xen-sparse/arch/xen/i386/mm/init.c b/linux-2.6.8.1-xen-sparse/arch/xen/i386/mm/init.c index 2e80b31c76..41b5d288c4 100644 --- a/linux-2.6.8.1-xen-sparse/arch/xen/i386/mm/init.c +++ b/linux-2.6.8.1-xen-sparse/arch/xen/i386/mm/init.c @@ -536,7 +536,7 @@ out: */ void __init paging_init(void) { - pgd_t *old_pgd = (pgd_t *)start_info.pt_base; + pgd_t *old_pgd = (pgd_t *)xen_start_info.pt_base; pgd_t *new_pgd = swapper_pg_dir; #ifdef CONFIG_XEN_PHYSDEV_ACCESS int i; @@ -567,7 +567,7 @@ void __init paging_init(void) flush_page_update_queue(); /* Completely detached from old tables, so free them. */ - free_bootmem(__pa(old_pgd), start_info.nr_pt_frames << PAGE_SHIFT); + free_bootmem(__pa(old_pgd), xen_start_info.nr_pt_frames << PAGE_SHIFT); #ifdef CONFIG_X86_PAE /* @@ -584,14 +584,14 @@ void __init paging_init(void) /* Switch to the real shared_info page, and clear the dummy page. */ flush_page_update_queue(); - set_fixmap_ma(FIX_SHARED_INFO, start_info.shared_info); + set_fixmap_ma(FIX_SHARED_INFO, xen_start_info.shared_info); HYPERVISOR_shared_info = (shared_info_t *)fix_to_virt(FIX_SHARED_INFO); memset(empty_zero_page, 0, sizeof(empty_zero_page)); #ifdef CONFIG_XEN_PRIVILEGED_GUEST /* Setup mapping of lower 1st MB */ for (i = 0; i < NR_FIX_ISAMAPS; i++) - if (start_info.flags & SIF_PRIVILEGED) + if (xen_start_info.flags & SIF_PRIVILEGED) set_fixmap_ma(FIX_ISAMAP_BEGIN - i, i * PAGE_SIZE); else set_fixmap_ma_ro(FIX_ISAMAP_BEGIN - i, diff --git a/linux-2.6.8.1-xen-sparse/arch/xen/kernel/ctrl_if.c b/linux-2.6.8.1-xen-sparse/arch/xen/kernel/ctrl_if.c index 40d29c70cb..d7f20c6e94 100644 --- a/linux-2.6.8.1-xen-sparse/arch/xen/kernel/ctrl_if.c +++ b/linux-2.6.8.1-xen-sparse/arch/xen/kernel/ctrl_if.c @@ -449,7 +449,7 @@ void ctrl_if_resume(void) { control_if_t *ctrl_if = get_ctrl_if(); - if ( start_info.flags & SIF_INITDOMAIN ) + if ( xen_start_info.flags & SIF_INITDOMAIN ) { /* * The initial domain must create its own domain-controller link. @@ -462,7 +462,7 @@ void ctrl_if_resume(void) op.u.bind_interdomain.dom2 = DOMID_SELF; if ( HYPERVISOR_event_channel_op(&op) != 0 ) BUG(); - start_info.domain_controller_evtchn = op.u.bind_interdomain.port1; + xen_start_info.domain_controller_evtchn = op.u.bind_interdomain.port1; initdom_ctrlif_domcontroller_port = op.u.bind_interdomain.port2; } @@ -470,7 +470,7 @@ void ctrl_if_resume(void) ctrl_if_tx_resp_cons = ctrl_if->tx_resp_prod; ctrl_if_rx_req_cons = ctrl_if->rx_resp_prod; - ctrl_if_evtchn = start_info.domain_controller_evtchn; + ctrl_if_evtchn = xen_start_info.domain_controller_evtchn; ctrl_if_irq = bind_evtchn_to_irq(ctrl_if_evtchn); #define SA_STATIC_ACTION 0x01000000 /* so that free_irq() doesn't do kfree() */ diff --git a/linux-2.6.8.1-xen-sparse/arch/xen/kernel/reboot.c b/linux-2.6.8.1-xen-sparse/arch/xen/kernel/reboot.c index 078f47eaaf..9b9761e841 100644 --- a/linux-2.6.8.1-xen-sparse/arch/xen/kernel/reboot.c +++ b/linux-2.6.8.1-xen-sparse/arch/xen/kernel/reboot.c @@ -103,7 +103,7 @@ static void __do_suspend(void) HYPERVISOR_shared_info = (shared_info_t *)empty_zero_page; clear_fixmap(FIX_SHARED_INFO); - memcpy(&suspend_record->resume_info, &start_info, sizeof(start_info)); + memcpy(&suspend_record->resume_info, &xen_start_info, sizeof(xen_start_info)); HYPERVISOR_suspend(virt_to_machine(suspend_record) >> PAGE_SHIFT); @@ -116,12 +116,12 @@ static void __do_suspend(void) shutting_down = -1; - memcpy(&start_info, &suspend_record->resume_info, sizeof(start_info)); + memcpy(&xen_start_info, &suspend_record->resume_info, sizeof(xen_start_info)); #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - set_fixmap_ma(FIX_SHARED_INFO, start_info.shared_info); + set_fixmap_ma(FIX_SHARED_INFO, xen_start_info.shared_info); #else - set_fixmap(FIX_SHARED_INFO, start_info.shared_info); + set_fixmap(FIX_SHARED_INFO, xen_start_info.shared_info); #endif HYPERVISOR_shared_info = (shared_info_t *)fix_to_virt(FIX_SHARED_INFO); diff --git a/linux-2.6.8.1-xen-sparse/drivers/char/mem.c b/linux-2.6.8.1-xen-sparse/drivers/char/mem.c index c456d2551f..3970f88b2a 100644 --- a/linux-2.6.8.1-xen-sparse/drivers/char/mem.c +++ b/linux-2.6.8.1-xen-sparse/drivers/char/mem.c @@ -224,7 +224,7 @@ static int mmap_mem(struct file * file, struct vm_area_struct * vma) #else unsigned long offset = vma->vm_pgoff << PAGE_SHIFT; - if (!(start_info.flags & SIF_PRIVILEGED)) + if (!(xen_start_info.flags & SIF_PRIVILEGED)) return -ENXIO; /* Currently we're not smart about setting PTE cacheability. */ diff --git a/linux-2.6.8.1-xen-sparse/drivers/xen/blkback/blkback.c b/linux-2.6.8.1-xen-sparse/drivers/xen/blkback/blkback.c index f07884a2d5..6d201022d2 100644 --- a/linux-2.6.8.1-xen-sparse/drivers/xen/blkback/blkback.c +++ b/linux-2.6.8.1-xen-sparse/drivers/xen/blkback/blkback.c @@ -551,8 +551,8 @@ static int __init blkif_init(void) { int i; - if ( !(start_info.flags & SIF_INITDOMAIN) && - !(start_info.flags & SIF_BLK_BE_DOMAIN) ) + if ( !(xen_start_info.flags & SIF_INITDOMAIN) && + !(xen_start_info.flags & SIF_BLK_BE_DOMAIN) ) return 0; blkif_interface_init(); diff --git a/linux-2.6.8.1-xen-sparse/drivers/xen/blkfront/blkfront.c b/linux-2.6.8.1-xen-sparse/drivers/xen/blkfront/blkfront.c index c47b3b9e12..e716001631 100644 --- a/linux-2.6.8.1-xen-sparse/drivers/xen/blkfront/blkfront.c +++ b/linux-2.6.8.1-xen-sparse/drivers/xen/blkfront/blkfront.c @@ -1352,8 +1352,8 @@ int __init xlblk_init(void) { int i; - if ( (start_info.flags & SIF_INITDOMAIN) - || (start_info.flags & SIF_BLK_BE_DOMAIN) ) + if ( (xen_start_info.flags & SIF_INITDOMAIN) + || (xen_start_info.flags & SIF_BLK_BE_DOMAIN) ) return 0; printk(KERN_INFO "[XEN] Initialising virtual block device driver\n"); diff --git a/linux-2.6.8.1-xen-sparse/drivers/xen/console/console.c b/linux-2.6.8.1-xen-sparse/drivers/xen/console/console.c index fef99c0897..217a1074b5 100644 --- a/linux-2.6.8.1-xen-sparse/drivers/xen/console/console.c +++ b/linux-2.6.8.1-xen-sparse/drivers/xen/console/console.c @@ -153,7 +153,7 @@ static int __init xen_console_init(void) void xen_console_init(void) #endif { - if ( start_info.flags & SIF_INITDOMAIN ) + if ( xen_start_info.flags & SIF_INITDOMAIN ) { if ( xc_mode == XC_DEFAULT ) xc_mode = XC_SERIAL; @@ -210,7 +210,7 @@ void xencons_force_flush(void) int sz; /* Emergency console is synchronous, so there's nothing to flush. */ - if ( start_info.flags & SIF_INITDOMAIN ) + if ( xen_start_info.flags & SIF_INITDOMAIN ) return; /* @@ -286,7 +286,7 @@ static void __xencons_tx_flush(void) int sz, work_done = 0; ctrl_msg_t msg; - if ( start_info.flags & SIF_INITDOMAIN ) + if ( xen_start_info.flags & SIF_INITDOMAIN ) { if ( x_char ) { @@ -700,7 +700,7 @@ static int __init xencons_init(void) tty_register_device(xencons_driver, 0, NULL); #endif - if ( start_info.flags & SIF_INITDOMAIN ) + if ( xen_start_info.flags & SIF_INITDOMAIN ) { xencons_priv_irq = bind_virq_to_irq(VIRQ_CONSOLE); (void)request_irq(xencons_priv_irq, @@ -728,7 +728,7 @@ static void __exit xencons_fini(void) if ( (ret = tty_unregister_driver(DRV(xencons_driver))) != 0 ) printk(KERN_ERR "Unable to unregister Xen console driver: %d\n", ret); - if ( start_info.flags & SIF_INITDOMAIN ) + if ( xen_start_info.flags & SIF_INITDOMAIN ) { free_irq(xencons_priv_irq, NULL); unbind_virq_from_irq(VIRQ_CONSOLE); diff --git a/linux-2.6.8.1-xen-sparse/drivers/xen/netback/netback.c b/linux-2.6.8.1-xen-sparse/drivers/xen/netback/netback.c index d1524b1f6e..143ccff364 100644 --- a/linux-2.6.8.1-xen-sparse/drivers/xen/netback/netback.c +++ b/linux-2.6.8.1-xen-sparse/drivers/xen/netback/netback.c @@ -776,8 +776,8 @@ static int __init netback_init(void) int i; struct page *page; - if ( !(start_info.flags & SIF_NET_BE_DOMAIN) && - !(start_info.flags & SIF_INITDOMAIN) ) + if ( !(xen_start_info.flags & SIF_NET_BE_DOMAIN) && + !(xen_start_info.flags & SIF_INITDOMAIN) ) return 0; printk("Initialising Xen netif backend\n"); diff --git a/linux-2.6.8.1-xen-sparse/drivers/xen/netfront/netfront.c b/linux-2.6.8.1-xen-sparse/drivers/xen/netfront/netfront.c index 53251f2ca0..9932683b68 100644 --- a/linux-2.6.8.1-xen-sparse/drivers/xen/netfront/netfront.c +++ b/linux-2.6.8.1-xen-sparse/drivers/xen/netfront/netfront.c @@ -1244,8 +1244,8 @@ static int __init netif_init(void) { int err = 0; - if ( (start_info.flags & SIF_INITDOMAIN) || - (start_info.flags & SIF_NET_BE_DOMAIN) ) + if ( (xen_start_info.flags & SIF_INITDOMAIN) || + (xen_start_info.flags & SIF_NET_BE_DOMAIN) ) return 0; IPRINTK("Initialising virtual ethernet driver.\n"); diff --git a/linux-2.6.8.1-xen-sparse/drivers/xen/privcmd/privcmd.c b/linux-2.6.8.1-xen-sparse/drivers/xen/privcmd/privcmd.c index c57bdf6b23..42c5b1309c 100644 --- a/linux-2.6.8.1-xen-sparse/drivers/xen/privcmd/privcmd.c +++ b/linux-2.6.8.1-xen-sparse/drivers/xen/privcmd/privcmd.c @@ -208,7 +208,7 @@ static struct file_operations privcmd_file_ops = { static int __init privcmd_init(void) { - if ( !(start_info.flags & SIF_PRIVILEGED) ) + if ( !(xen_start_info.flags & SIF_PRIVILEGED) ) return 0; privcmd_intf = create_xen_proc_entry("privcmd", 0400); diff --git a/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/mach-xen/setup_arch_post.h b/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/mach-xen/setup_arch_post.h index 86c3d7c2ad..8f6c7b2daa 100644 --- a/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/mach-xen/setup_arch_post.h +++ b/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/mach-xen/setup_arch_post.h @@ -14,7 +14,7 @@ static char * __init machine_specific_memory_setup(void) who = "Xen"; start_pfn = 0; - max_pfn = start_info.nr_pages; + max_pfn = xen_start_info.nr_pages; e820.nr_map = 0; add_memory_region(PFN_PHYS(start_pfn), PFN_PHYS(max_pfn) - PFN_PHYS(start_pfn), E820_RAM); diff --git a/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/setup.h b/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/setup.h index a8ef8aa22b..03a3a64183 100644 --- a/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/setup.h +++ b/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/setup.h @@ -53,8 +53,8 @@ extern unsigned char boot_params[PARAM_SIZE]; #define AUX_DEVICE_INFO (*(unsigned char *) (PARAM+0x1FF)) #define LOADER_TYPE (*(unsigned char *) (PARAM+0x210)) #define KERNEL_START (*(unsigned long *) (PARAM+0x214)) -#define INITRD_START (__pa(start_info.mod_start)) -#define INITRD_SIZE (start_info.mod_len) +#define INITRD_START (__pa(xen_start_info.mod_start)) +#define INITRD_SIZE (xen_start_info.mod_len) #define EDID_INFO (*(struct edid_info *) (PARAM+0x440)) #define EDD_NR (*(unsigned char *) (PARAM+EDDNR)) #define EDD_MBR_SIG_NR (*(unsigned char *) (PARAM+EDD_MBR_SIG_NR_BUF)) diff --git a/linux-2.6.8.1-xen-sparse/include/asm-xen/hypervisor.h b/linux-2.6.8.1-xen-sparse/include/asm-xen/hypervisor.h index e1ee44a014..b2f964be2a 100644 --- a/linux-2.6.8.1-xen-sparse/include/asm-xen/hypervisor.h +++ b/linux-2.6.8.1-xen-sparse/include/asm-xen/hypervisor.h @@ -19,13 +19,13 @@ #include /* arch/xen/i386/kernel/setup.c */ -union start_info_union +union xen_start_info_union { - start_info_t start_info; + start_info_t xen_start_info; char padding[512]; }; -extern union start_info_union start_info_union; -#define start_info (start_info_union.start_info) +extern union xen_start_info_union xen_start_info_union; +#define xen_start_info (xen_start_info_union.xen_start_info) /* arch/xen/kernel/process.c */ void xen_cpu_idle (void); -- 2.30.2